projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b7136a
)
Fix assertion violations in fontset_find_font
author
Eli Zaretskii
<eliz@gnu.org>
Mon, 1 Jul 2019 16:25:52 +0000
(19:25 +0300)
committer
Eli Zaretskii
<eliz@gnu.org>
Mon, 1 Jul 2019 16:25:52 +0000
(19:25 +0300)
* src/fontset.c (fontset_find_font): Don't assume REPERTORY
must be a fixnum.
src/fontset.c
patch
|
blob
|
history
diff --git
a/src/fontset.c
b/src/fontset.c
index 2c45c95c3a258f971fb61cebb0e540e8c9222eb7..137d28959326b23d323504b1e7207caa9e50887e 100644
(file)
--- a/
src/fontset.c
+++ b/
src/fontset.c
@@
-575,7
+575,7
@@
fontset_find_font (Lisp_Object fontset, int c, struct face *face,
break;
repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
- if (
XFIXNUM
(repertory) == charset_id)
+ if (
FIXNUMP (repertory) && XFIXNUM_RAW
(repertory) == charset_id)
{
charset_matched = i;
break;